From 1d40f297760b3965a1462489c6a4b5adfb57f095 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 15 Oct 2020 12:00:00 -0400
Subject: [PATCH] wayland: Make gdk_wayland_device_pad_set_feedback private

It is not a generally useful api, and awkwardly named.
---
 docs/reference/gdk/gdk4-sections.txt    |  1 -
 gdk/wayland/gdkdevice-wayland-private.h | 16 ++++++++++------
 gdk/wayland/gdkdevice-wayland.c         |  2 +-
 gdk/wayland/gdkwaylanddevice.h          |  6 ------
 gtk/gtkpadcontroller.c                  |  1 +
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt
index 32f36749e2..9373f948f3 100644
--- a/docs/reference/gdk/gdk4-sections.txt
+++ b/docs/reference/gdk/gdk4-sections.txt
@@ -969,7 +969,6 @@ gdk_wayland_device_get_wl_seat
 gdk_wayland_device_get_wl_pointer
 gdk_wayland_device_get_wl_keyboard
 gdk_wayland_device_get_node_ath
-gdk_wayland_device_pad_set_feedback
 
 <SUBSECTION Monitor>
 gdk_wayland_monitor_get_wl_output
diff --git a/gdk/wayland/gdkdevice-wayland-private.h b/gdk/wayland/gdkdevice-wayland-private.h
index 3dae422081..b22a4f3814 100644
--- a/gdk/wayland/gdkdevice-wayland-private.h
+++ b/gdk/wayland/gdkdevice-wayland-private.h
@@ -3,11 +3,15 @@
 
 #include "gdkwaylanddevice.h"
 
-void
-gdk_wayland_device_query_state (GdkDevice        *device,
-                                GdkSurface       *surface,
-                                double           *win_x,
-                                double           *win_y,
-                                GdkModifierType  *mask);
+void gdk_wayland_device_query_state (GdkDevice        *device,
+                                     GdkSurface       *surface,
+                                     double           *win_x,
+                                     double           *win_y,
+                                     GdkModifierType  *mask);
+
+void gdk_wayland_device_pad_set_feedback (GdkDevice           *device,
+                                          GdkDevicePadFeature  feature,
+                                          guint                feature_idx,
+                                          const char          *label);
 
 #endif
diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c
index cd77fa75f2..8671561175 100644
--- a/gdk/wayland/gdkdevice-wayland.c
+++ b/gdk/wayland/gdkdevice-wayland.c
@@ -5064,7 +5064,7 @@ gdk_wayland_device_get_node_path (GdkDevice *device)
   return NULL;
 }
 
-/**
+/*<private>
  * gdk_wayland_device_pad_set_feedback:
  * @device: (type GdkWaylandDevice): a %GDK_SOURCE_TABLET_PAD device
  * @feature: Feature to set the feedback label for
diff --git a/gdk/wayland/gdkwaylanddevice.h b/gdk/wayland/gdkwaylanddevice.h
index 577f3bbf24..fbd51b6fe1 100644
--- a/gdk/wayland/gdkwaylanddevice.h
+++ b/gdk/wayland/gdkwaylanddevice.h
@@ -56,12 +56,6 @@ struct wl_keyboard  *gdk_wayland_device_get_wl_keyboard     (GdkDevice *device);
 GDK_AVAILABLE_IN_ALL
 const char          *gdk_wayland_device_get_node_path       (GdkDevice *device);
 
-GDK_AVAILABLE_IN_ALL
-void                 gdk_wayland_device_pad_set_feedback (GdkDevice           *device,
-                                                          GdkDevicePadFeature  feature,
-                                                          guint                feature_idx,
-                                                          const char          *label);
-
 G_END_DECLS
 
 #endif /* __GDK_WAYLAND_DEVICE_H__ */
diff --git a/gtk/gtkpadcontroller.c b/gtk/gtkpadcontroller.c
index dbda9027cd..c4871aa981 100644
--- a/gtk/gtkpadcontroller.c
+++ b/gtk/gtkpadcontroller.c
@@ -77,6 +77,7 @@
 
 #ifdef GDK_WINDOWING_WAYLAND
 #include <gdk/wayland/gdkwayland.h>
+#include "gdk/wayland/gdkdevice-wayland-private.h"
 #endif
 
 struct _GtkPadController {
-- 
2.30.2